Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Loadout Customization - Items expanded & more... #7614

Open
wants to merge 48 commits into
base: master
Choose a base branch
from
Open

Loadout Customization - Items expanded & more... #7614

wants to merge 48 commits into from
+1,567 −18

Conversation

Zenith00000
Copy link
Contributor

@Zenith00000 Zenith00000 commented Nov 18, 2024 •
edited
Loading

About the pull request

Adds a lot of new things, around 80 completely new items, and various other items added, as well as many changes and price revisions. Also things like WY-patches, Freelancer patches are now added to the loadout of PMC's, Freelancer and other appropriate factions.

Basically I wanted to greatly expand the loadout menu, with much more choice and interesting things to pick, there should be more interesting loadouts we'll see. I've also added a "Civilian only" tab, which restricts some of the gear to appropriate roles, like survivors, CL and the Reporter.

Everything that's added

Equipment List

Eyewear:

  • Eyepatch, black flipped
  • Eyepatch, white
  • Eyepatch, white flipped
  • Eyepatch, green
  • Eyepatch, green flipped
  • Ballistic goggles, red
  • Prescription ballistic goggles, red
  • Ballistic goggles, blue
  • Prescription ballistic goggles, blue
  • Ballistic goggles, purple
  • Prescription ballistic goggles, purple
  • Ballistic goggles, yellow
  • Prescription ballistic goggles, yellow
  • Ballistic goggles, M1A1 blue
  • Prescription ballistic goggles, M1A1 blue
  • Polarized Ballistic goggles, M1A1 blue
  • Prescription Polarized ballistic goggles, M1A1 blue
  • Polarized Ballistic goggles, M1A1 orange
  • Prescription Polarized ballistic goggles, M1A1 orange
  • BiMex tactical shades, black
  • BiMex tactical shades, yellow
  • BiMex tactical shades, bronze

Civilian Shades (restricted):

  • BiMax personal shades
  • BiMax personal shades, red
  • BiMax personal shades, orange
  • BiMax personal shades, yellow
  • BiMax personal shades, green
  • BiMax personal shades, blue

Masks and Scarves:

  • Smock, classic
  • Smock, jungle
  • Smock, snow
  • Smock, desert
  • Smock, urban
  • Smock, black
  • Keffiyeh
  • Keffiyeh, white
  • Keffiyeh, red
  • Keffiyeh, green
  • Keffiyeh, black

Helmet Accessories:

  • Desert Helmet netting
  • Jungle Helmet netting
  • Jungle Rain cover
  • Urban Rain cover

Facepaint & Bodypaint:

  • Fullbody paint, snow
  • Fullbody paint, desert
  • Fullbody paint, jungle
  • Fullbody paint, urban

Bayonets, Weapons & Tools:

  • Colonial Companion Mk. II (Swiss army knife tool)
  • S&W .38 model 37 Custom revolver
  • Antique bayonet
  • L5 Bayonet
  • M5 'Raven's Claw' tactical bayonet
  • M5 'Raven's Claw' tactical bayonet, red
  • M5 'Raven's Claw' tactical bayonet, blue
  • M5 'Raven's Claw' tactical bayonet, black
  • T9 tactical bayonet
  • T9 tactical bayonet, blue

Patches (USCM):

  • Falling Falcons UA shoulder patch
  • Falling Falcons large chest patch
  • Falling Falcons shoulder patch, Alpha
  • Falling Falcons shoulder patch, Bravo
  • Falling Falcons shoulder patch, Charlie
  • Falling Falcons shoulder patch, Delta
  • Falling Falcons shoulder patch, Echo
  • United Americas shoulder patch

Civilian Patches (restricted):

  • Weyland-Yutani shoulder patch
  • Weyland-Yutani shoulder patch, white
  • Weyland-Yutani Fury '161' patch
  • Three World Empire shoulder patch
  • Union of Progressive Peoples shoulder patch, gold
  • Sons of Mars shoulder patch
  • Old Freelancer shoulder patch
  • Field Medic shoulder patch

Miscellaneous (Boots, Gloves & Accessories):

  • Grey combat boots
  • Urban pattern combat boots
  • Grey combat gloves
  • Black Webbing

Also adds various things to the loadout menu, and adjusts the prices, above is all of the new stuff added sprite-wise.

Explain why it's good for the game

More customization is good, as well as options for civilians. Things that were missing like faction patches and black webbing. Most of the stuff isn't too far from the current gear loadouts, it shouldn't be too much of an issue.

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

loadoutmenu

loadoutground

somegear

Changelog

🆑 Zenith, Crowford, Frans_Feiffer, VaNdU-jr, cuberound, armolitskiy

add: Added around 80 new loadout items, and more other loadout items previously missing

/:cl:

@cmss13-ci cmss13-ci bot added Sprites Remove the soul from the game. Feature Feature coder badge labels Nov 18, 2024
@Wintermote
Copy link

Would be nice if the vast majority, or all, purely cosmetic items like scarves, berets, or goggles, only cost 1 point instead of 2-3.

Seems like it'll happen eventually anyway as the scope of cosmetic attachments and items increases. As it is right now though - TWE shoulder patch (1) + beret (3)? Then you can forget having your RMC bayonet (4) to go with it, even though it'd be thematically appropriate.

Just seems oddly and unnecessarily restrictive for stuff that doesn't influence gameplay much/at all.

@Blundir Blundir added the Sprites Frozen Merge this and you will make the spritetainers angry. label Nov 19, 2024
@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 19, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Nov 19, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@Zenith00000
Copy link
Contributor Author

Would be nice if the vast majority, or all, purely cosmetic items like scarves, berets, or goggles, only cost 1 point instead of 2-3.

Seems like it'll happen eventually anyway as the scope of cosmetic attachments and items increases. As it is right now though - TWE shoulder patch (1) + beret (3)? Then you can forget having your RMC bayonet (4) to go with it, even though it'd be thematically appropriate.

Just seems oddly and unnecessarily restrictive for stuff that doesn't influence gameplay much/at all.

I'd agree, but there's probably a reason why the prices were set the way they are. I'm guessing because they don't want marines running around with every cosmetic, making it more about picking your favorites rather then everything possible. I do see both sides though and I'll consider it after getting some more feedback.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Nov 23, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@fluffe9911
Copy link
Contributor

Squad colored smock when?

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 16, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 16, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 16, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Zenith00000 Zenith00000 marked this pull request as ready for review December 16, 2024 13:59
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 16, 2024
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github cm13-github added the Merge Conflict PR can't be merged because it touched too much code label Dec 27, 2024
@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@cm13-github cm13-github removed the Merge Conflict PR can't be merged because it touched too much code label Dec 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zonespace27 Zonespace27 Awaiting requested review from Zonespace27 Zonespace27 is a code owner

Assignees
No one assigned
Labels
Feature Feature coder badge Sprites Frozen Merge this and you will make the spritetainers angry. Sprites Remove the soul from the game.
Projects
Review Backlog
Status: Awaiting Review
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Zenith00000 @Wintermote @cm13-github @fluffe9911 @Blundir @uuuuhuuuu